Merge fix for Bug#8879 from trunk
authorChong Yidong <cyd@stupidchicken.com>
Sat, 18 Jun 2011 19:23:54 +0000 (15:23 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sat, 18 Jun 2011 19:23:54 +0000 (15:23 -0400)
commit27ef3d5975fc1ac36ce8842e979b735666d91dc7
tree54fe906488474003f98195fe4dd5d07c98939180
parentb428813ea9c233ea01ba1657da8cc28893ceaa40
parentaebbe3c70c5b6f37134fed65834950ebdaadcc84
Merge fix for Bug#8879 from trunk